Skip to content

Align the metrics service selectors#1565

Merged
openshift-merge-bot[bot] merged 1 commit into
openstack-k8s-operators:mainfrom
dprince:metrics_service_fix
Aug 14, 2025
Merged

Align the metrics service selectors#1565
openshift-merge-bot[bot] merged 1 commit into
openstack-k8s-operators:mainfrom
dprince:metrics_service_fix

Conversation

@dprince

@dprince dprince commented Aug 14, 2025 •
edited by openshift-ci Bot
Loading

Copy link
Copy Markdown
Contributor

Jira: OSPRH-19125

@openshift-ci openshift-ci Bot requested review from rabi and stuggi August 14, 2025 19:34
abays
abays approved these changes Aug 14, 2025
View reviewed changes

@abays abays left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci Bot added the lgtm label Aug 14, 2025
@openshift-ci

openshift-ci Bot commented Aug 14, 2025

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abays, dprince

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot Bot merged commit aaeffd2 into openstack-k8s-operators:main Aug 14, 2025
8 checks passed
@stuggi

stuggi commented Aug 15, 2025

Copy link
Copy Markdown
Contributor

/cherry-pick 18.0-fr3

@openshift-cherrypick-robot

openshift-cherrypick-robot commented Aug 15, 2025

Copy link
Copy Markdown

@stuggi: #1565 failed to apply on top of branch "18.0-fr3":

Applying: Align the metrics service selectors
Using index info to reconstruct a base tree...
M	bindata/rbac/octavia-operator-rbac.yaml
A	bindata/rbac/watcher-operator-rbac.yaml
M	hack/sync-bindata.sh
Falling back to patching base and 3-way merge...
Auto-merging hack/sync-bindata.sh
CONFLICT (modify/delete): bindata/rbac/watcher-operator-rbac.yaml deleted in HEAD and modified in Align the metrics service selectors. Version Align the metrics service selectors of bindata/rbac/watcher-operator-rbac.yaml left in tree.
Auto-merging bindata/rbac/octavia-operator-rbac.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Align the metrics service selectors
Details

In response to this:

/cherry-pick 18.0-fr3

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@abays abays abays approved these changes

@rabi rabi Awaiting requested review from rabi

@stuggi stuggi Awaiting requested review from stuggi

Assignees

@abays abays

Labels

approved lgtm

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@dprince @stuggi @openshift-cherrypick-robot @abays